Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Desk Bell #5330

Closed
wants to merge 6 commits into from
Closed

Desk Bell #5330

wants to merge 6 commits into from

Conversation

Birdtalon
Copy link
Contributor

@Birdtalon Birdtalon commented Dec 29, 2023

About the pull request

Using my maintainer privilege to add this small feature during the freeze. A desk bell.

Wrench to secure it and use it.
Bell can break at a 1% chance for every 100 rings. In which case a screwdriver will fix it.

dreamseeker_2023-12-29_00-39-47
dreamseeker_2023-12-29_00-39-56

Credit:
Modified code and desk_bell.ogg from Paradise SS13
Sprite from Kat 'APC' Smith - darklordcabbage on discord.
Animated sprite from Thwomp

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 Birdtalon, Kat 'APC' Smith, Thwomp
add: Desk bell for cargo and medbay.
soundadd: Desk bell sound effect.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Dec 29, 2023
code/modules/paperwork/desk_bell.dm Outdated Show resolved Hide resolved
code/modules/paperwork/desk_bell.dm Outdated Show resolved Hide resolved
code/modules/paperwork/desk_bell.dm Outdated Show resolved Hide resolved
@JackieEstegado
Copy link
Contributor

Please for the love of all that is hearing, increase the cooldown to AT LEAST 3 seconds.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mapping lgtm

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jan 5, 2024
@Birdtalon Birdtalon removed the Mapping Approved adds 500 new dict keys label Jan 8, 2024
@Birdtalon Birdtalon requested a review from Nanu308 January 8, 2024 19:32
@Birdtalon
Copy link
Contributor Author

Have made further map changes @Nanu308 added a couple more bells to various areas at request of the sprite artist.

@Birdtalon Birdtalon marked this pull request as ready for review January 8, 2024 19:33
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's cute, but the bell is way too high off the stand and the stand is also way too big. You only really need a pixel of locomotion for the animation to be visible from a distance, and can achieve that even with a small stand. See below for my recommendation.
image

image

Also note: avoid using diagonals that zig-zag like this. Try using an intermediate color to break up the line instead, or avoid zig-zags entirely and use straight diagonals.

@Birdtalon
Copy link
Contributor Author

@nauticall thanks for the review, I will pass this onto the spriter and get them to adjust the sprite accordingly.

@Birdtalon Birdtalon marked this pull request as draft January 11, 2024 16:58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jan 16, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jan 24, 2024
@github-actions github-actions bot closed this Feb 1, 2024
@Birdtalon Birdtalon deleted the bell branch February 25, 2024 12:52
github-merge-queue bot pushed a commit that referenced this pull request Mar 24, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

Revives #5330.
Cooldown adjusted because I know how much of a headache a 1 second
cooldown would give.
Credit:
Modified code and desk_bell.ogg from [Paradise
SS13](https://github.com/ParadiseSS13/Paradise)
Sprite from Kat 'APC' Smith - darklordcabbage on discord. I just
modified it a bit according to nauticall's review on the past PR.
Animated sprite from Thwomp. Also modified.
Birdtalon for the code.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

Grab req's attention without having to point at their floor.
Grab the offscreen WJ's attention.
Immersion?


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/42235601/7e6bbacd-7144-4a4a-bf8c-9ef25bba6135)

![image](https://github.com/cmss13-devs/cmss13/assets/42235601/02aeca97-3d9d-4af5-b905-5efc355b57df)


</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl: Birdtalon, Kat 'APC' Smith, Thwomp, Waseemq1235
add: Desk bell for cargo, medbay, brig, and AI reception.
soundadd: Desk bell sound effect.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: SabreML <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game. Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants